Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Fri, 7 Jun 2019 19:06:01 +0000 (22:06 +0300)
committerEli Zaretskii <eliz@gnu.org>
Fri, 7 Jun 2019 19:06:01 +0000 (22:06 +0300)

Trivial merge